Merge with xenppc-unstable-merge.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 15 Aug 2006 09:30:19 +0000 (10:30 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 15 Aug 2006 09:30:19 +0000 (10:30 +0100)
commit9be8189ed02d9b57c283312b304ab4e32f99c112
treec2f43607c2e0ae7653713f3d659ebca8d89f58ef
parent47bc089713c69ab5031193070640fdd8e46451b7
parent99c09abe281c30441c809bee095adbfd4799bdbe
Merge with xenppc-unstable-merge.hg